Framework Camera Changes

Change-Id: I19a15614cc5fd8a21485325e3f9f0a5970a05a8e