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

This reverts commit 537c3e9629c4538b5581e069e38ee57e8e99d590.
Rebase from 'upstream'
Trimmed the branch to only the opt_camera sub directory