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

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