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

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