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

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