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

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