This adds all newer commits for the camera wrapper
and relevant commits. Thanks CM Gerrit.