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

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