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

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