This reverts commit 0a98d27b. Reason for revert: b/187301322 Change-Id: Iae9acc88841f214a5e3a14f83c3d5ee8b9ffd422 Bug: 187301322