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

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