Squashed updates for camera

Change-Id: I78f825135da1721680571205937106ba000b6f81