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

* commit 'ba5fd35e24778c29ad0786d865c2cbdf3a5ab27d':
  Adding camera scene mode stress test.