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

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