This reverts commit 968b2db0. Reason for revert: Not cause of b/184141588 Change-Id: I9f886e3912dce8c68fee9376f010cd251889b97b