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

This reverts commit 59ebc8ca1033c93c6d5d5c71e04cf48e4c026a81.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory