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

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