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

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