Merge "Hunt around for alternative shutter IDs." into oc-dev
am: a6d36fd1ae

Change-Id: Iae14c3031d7bd27298b3c1191fd6ad5f8d3e1edc