some camera changes

Change-Id: I811d9f9f0139ce2c59d823f30cc58fc71578aa17