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

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