This reverts commit 049c9b40. Reason for revert: b/140006229 Change-Id: I4cd4cd6919c0206b6023f744fe889fa0404365d6