Merge "Fix API name based on API review" into mnc-dev