Merge "Update API." into mnc-dev