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

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