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

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