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

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