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

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