f34811d3a3
Test: ABTD
https://android-build.googleplex.com/builds/abtd/run/L52600000956969786
This reverts commit cee6ddf3de.
Reason for revert: Fixed in ag/20239136
Change-Id: I0e8446e66d9a86a94b40fcbd6de14da07abe8e5c