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

This reverts commit 4507e914f1ebb7b4dbed705c42ad0907d49610d4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory