This reverts commit 25cd9813. Reason for revert: b/274474681 is fixed. Bug: 229654778 Change-Id: I4b975ced02ffe0d5a432a3033f05bb61868bec45