Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp