Merge "Camera: Trivial doc update" am: cf68127174
am: be0061510a

Change-Id: I629ba8680ce6a81ba002917170e2ca8e44d5bb59