am 0c5b1ca7: am 606f566d: am 0d0b3442: am 69a910a2: am 1a264216: am 5ac00e11: am 6a11fe41: Merge "Improve CameraTest stability." into lollipop-mr1-cts-dev

* commit '0c5b1ca7fc8c5525502a60e4d6638bb0569c37e9':
  Improve CameraTest stability.