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

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