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

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