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

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