This reverts commit 54e707a6. Reason for revert: Test broken on R: b/185751610 Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f