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

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