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

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