Merge "More API changes." into mnc-dev