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

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