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

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