This reverts commit e4274bea. Reason for revert: causes b/156276800 -- lets revert in beta Bug: 156115497 Change-Id: Ie3c8c5f0599ac4e2119553611ffd2f2cf9cf58f2