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

Change-Id: I69629ce209b6b05002808e8a4e39e63c72e2dfd9