Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Id21c5cc3e276166c24009244a452f268fd64571e
tree: 257ce153a48d0e8c1d1f5fd9a783661252a768df
  1. camera/