am e15285c1: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1':
  Camera: Fix green JPEGs