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

This reverts commit f5b0d335c6148a9a13d401b3e131b50f44a30b18.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory