[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: 15a4d3a2 -s ours
am: 697efc59 -s ours
am skip reason: change_id Id259d42cbd7802614318d8f69c80470419f3b54b with SHA1 b928a87e is in history
Change-Id: I3851261ae50b11b5febbb0c8d150cad7d7651e87