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

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