This reverts commit 4ae46cd1ad. Bug: 36148078 Change-Id: I776ad2e6ba0eabacb3d6be6de23ba37fe5ce7bc7
4ae46cd1ad