This reverts commit 85e0ad79. Reason for revert: b/177411288 broken test Bug: 177411288 Bug: 175662146 Change-Id: I02a25b83e62ab9a2ed22a98530d62b08de73f56e