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

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