This reverts commit ddc496d6. Reason for revert: b/126374865 Change-Id: I53f87d15712a0f2acc5787efcf68c72021e9b831