Merge commit 'f2cccfc32c7f686c13beee507e21387dfb47680a' into HEAD

Change-Id: I1794f024881aab16594f0df852bd91a7c31d2dbc
tree: 560eb7054498800cd27e93d70c7d09fdfe401d06
  1. camera/