Nail down more camera stuff

Change-Id: Iff89f180142840c04450448df5c86a85ccd64ee9