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

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