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

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