This reverts commit 2cb7593792. Reason for revert: reland after fixing b/186468053 Bug: 184190315 Change-Id: I2a46b7a8148db444f9bd4b24746f64217cbba947
2cb7593792