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

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