This reverts commit 7c88cf83. Original bug: b/134561008 Reason for revert: b/135084202 Change-Id: Ib4c17f98d66c9efb10d800d9ba585d14be4ac878