superior: Fix for camera

Change-Id: Ic854dd7072095069391b20e79cc7c53252a49be6
Merge "superior: Fix for camera" into android-4.4