This reverts commit 9b5795a579. Reason for revert: b/155090034 Change-Id: If7decd54965a680d50e4474fb279ebe0002441bb
9b5795a579