Merge "Fix NPE on checkapi with malformed text input" into mnc-dev