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

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