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

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