Camera fixup

Change-Id: Ifadbaf869779bd86ac43fb543ba59d8d67ff9d4a