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

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