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

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