more fixup with camera wrapper..

Change-Id: I245431b46d63e3392a67fc3c66509157a37be45d