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

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