Merge "Clean remaining API related issues." into mnc-dev