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

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