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

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