007e7e94b3
This reverts commit 406d49bdd7.
Reason for revert: Breaks tests on Crosshatch
Change-Id: I95ff541dfe8f6f1d7e1913d209b53abfbebe5336
http://go/tapl