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

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