This reverts commit a984c97e. Reason for revert: b/72967560 Change-Id: Ie7c160dd63cf952e272022bf5f7670940ba3e83b