Camera fix

Change-Id: Idcbc65864b817cad542bcd50a1c83569e95ace76
Merge "Camera fix" into lollipop