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

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