Merge "Camera: fix wrong vector size bug" am: 5d03729b82 am: dad308b4f3
am: 248334cb2a

Change-Id: Ib63073a39dab79f39c02ec469673a2f3c607c994