camera: squashed commit

Change-Id: I929a613970ef2a1fdbd9e5242acc05499b17516c