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

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