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

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