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

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