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

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