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

This reverts commit 8c2c2b71fd812da2bab6da01435899f7273cf6cd.
Rebase from 'upstream'
Trimmed the branch to only the opt_camera sub directory
Revert "Trimmed the branch to only the opt_camera sub directory"

This reverts commit 7bb31961ecd7deccb8e25f707f8e131f805fcfce.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the opt_camera sub directory