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

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