This reverts commit 67b80596. Reason for revert: b/131868150 Bug: 131423779 Change-Id: I7c373e2949cbb8e98322500ae6a1c866fcbfcba0