Merge "Fixes for APi review" into mnc-dev