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

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