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

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