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

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