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

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