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

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