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

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