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

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