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

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