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

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