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

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