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

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