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

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