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

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