Revert "Trimmed the branch to only the opt_camera sub directory"

This reverts commit 3a545c0958498fb61524572480db68c76724315c.
Rebase from 'upstream'
Trimmed the branch to only the opt_camera sub directory