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

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