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

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