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

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