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

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