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

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