This reverts commit da436d4a. Reason for revert: b/194083907, b/193993655 Bug: 194083907 Bug: 193993655 Change-Id: I75352215d995707b3bc23e04434c85a0fd9db6b3