i9300: Fixes for Camera Wrapper

Change-Id: I92b2801294aef42fc6af100f812b9c3c91549533