This reverts commit 04d920d4. Reason for revert: b/148087431 Bug: 148087431 Change-Id: I56c449f8d62ae872a72a7d9bc2ff62584bb3689e