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

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