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

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