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

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