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

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