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

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