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

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