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

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