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

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