iProductization and fixing missing CameraParameter (the clean way :) ).

Change-Id: Ic21bf554a7c72b3d5376c681687fb3d83f32d20f