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

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