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

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