This reverts commit 4c15a8f190. Reason for revert: Breaks mainline build Change-Id: Ia1fc5e5723ec688d47544cc26127b680fad59b58
4c15a8f190