This reverts commit 8a7c97a1. Reason for revert: b/77566214 Bug: 77566214 Change-Id: Iba3ef20a304e3a47f1affe0b38598c7d7f0daef7