This reverts commit e32c9ac7. Reason for revert: b/180420011 Change-Id: I576515a415bb6f3cdf4619a542dcca385e16d93f