Fix Camera

Change-Id: Ic1594eff347721573522a3f0d9998e9025af8261