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

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