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

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