This reverts commit 56866118. Reason for revert: b/294998861 Change-Id: I8616665f69be8e827529ed3a76b337606b900dfc