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

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