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

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