This reverts commit 24870216. Reason for revert: b/282584808 Change-Id: I3808121b4437fdd01db5d305d8f0377e6ad7bd9e