[automerger skipped] Merge "Fixed issue where camera wouldn't launch" into...
[automerger skipped] Merge "Fixed issue where camera wouldn't launch" into qt-r1-dev am: 58432a11 am: 4f5252bd
am: 0a14103e -s ours
am skip reason: change_id Id259d42cbd7802614318d8f69c80470419f3b54b with SHA1 b928a87e is in history
Change-Id: Id41547c90ea5b7fecac960530477f596f22dfac2