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

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