This reverts commit 099a611a. 570-checker-osr intermittently failing. Bug: 27939339 Change-Id: I9f1b4139118b1d803ea9c21319c3147d2f40fec9