This reverts commit 02c47655e7. Reason for revert: broke another test b/186468053 Change-Id: I0ec82455ad203071e523092ae3cb5f0f1df6aac7
02c47655e7