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

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