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

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