merge in jb-mr1-release history after reset to jb-mr1-dev
tree: 97f7164e7b46ca46518ef451764f09e61868d12c
  1. camera/