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

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