This reverts commit 67b1e543. Bug: 131167067 Reason for revert: b/131167067 Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5