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

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