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

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