big changes to camera class

Change-Id: I77a4a186d594b71ed25acab294f891376d9dc4bc
Merge "big changes to camera class"