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

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