Merge "Remove deprecated CarCamera interface" into oc-dev