This reverts commit ea303904. Reason for revert: b/185890964 Change-Id: I270dc16de0e24728c694830fbe920786b6d90174