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

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