Snap for 4481641 from f8ea581a5c3a8951c2a35506fa1557b8b6cb04e4 to pi-release

Change-Id: Iae5b1557d9c74df5cb92164fc5bb92df4aee84c7
tree: e595eb0b8764db8d5473f117458ab00631d961da
  1. camera/