Merge "OtaDexoptService: Add missing return" into oc-dev