Merge "Fix APIs." into mnc-dev