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

* commit 'f329f57bad833055cbd824222ce10998ebb17ec5':
  Fix flakey tests, and change testing area to a centered 90x90px area