more camera stuff

Change-Id: I4e10485c22d40824819a27c383543c14e8e43a48