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

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