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

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