FIX CAMERA FINALLY

Change-Id: I286600869ada09cdc9e200abafbc7f88ed114062