Merge "Camera: Trivial doc update" am: e9f1e8c123
am: 9481340777

Change-Id: I5d9c7fc848eb154e27012f1101340da2195bc423