This reverts commit 33a7ce84. Reason for revert: test failure, b/207427578 Change-Id: I211a344659036248388e587c7cdf5082b8bdbf9d