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

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