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

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