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

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