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

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