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

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