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

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