Further correct camera wrappage

Change-Id: Ib1e2b3b946eff835e6787565fd22a5bf438db816