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

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