Merge "Camera: Trivial doc update" am: 2b5539f5e5 am: 15767f82fd
am: 541dc41c26

Change-Id: Iee524a47ffcc2f76993ed24d0f8e2452790b2ea7