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

This reverts commit 7d52a7af5b882e15de58b8b89d3749cdb23a3959.
Rebase from 'upstream'
Trimmed the branch to only the opt_camera sub directory
Revert "Trimmed the branch to only the opt_camera sub directory"

This reverts commit 085f5c69e57d91a9a5326418563c37ae1af9e363.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory