Merge "Address API review comments" into mnc-ub-dev