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

Change-Id: I20984eefe33ab8633dd491bb9ab433958f15925f