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

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