This reverts commit cbde8ce7. Reason for revert: b/140938772 Change-Id: Ia5b481541895154a0f4da889c62619a4c1c7ecbc