cameraworkaround

Change-Id: Idb345efb620d41d07c4230dd9892b4eaef9ef142