am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev

* commit '7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
  Adding camera scene mode stress test.