This reverts commit c04cb4918f.
Reason for revert: ag/7076430 will fix the broken test.
Bug: 130644407
Change-Id: I30ec1476d562b557e0724822261f11bef0e71578
This reverts commit c04cb4918f.
Reason for revert: ag/7076430 will fix the broken test.
Bug: 130644407
Change-Id: I30ec1476d562b557e0724822261f11bef0e71578