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

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