This reverts commit 2d2315a6. Reason for revert: possible cause for b/37156733 Change-Id: I02d468449f0632d1281ab5ad2a381e7e36a5b0ea