This reverts commit eae3a9e4. Reason for revert: b/183174863 Bug: 183174863 Change-Id: I4db923e112bba149f4e8eb4cfa8c3f97defd5e63