This reverts commit 5bdfb4c1. Reason for revert: fixed the flakyness in ag/3650459 Change-Id: I4a73a0f82a087fb59da79f286e98f0e1f88693b5