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

Change-Id: Id148d8a89cb93a5590bd99006a660ed9baf7c02f