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

Change-Id: Iabb83534578ed0104790a0120f851367987d7b45