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

This reverts commit d8bcefbe65642e4f3b2d79e686f6aa4afe441cb9.
Rebase from 'upstream'
Trimmed the branch to only the opt_camera sub directory