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

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