am 4b275e0f: Merge "Fix flakey tests, and change testing area to a centered...
am 4b275e0f: Merge "Fix flakey tests, and change testing area to a centered 90x90px area" into lmp-mr1-dev
* commit '4b275e0f':
Fix flakey tests, and change testing area to a centered 90x90px area