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

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