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

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