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

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