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

This reverts commit b724b3c333b917d42879e3d25c906c52ce8fb664.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory