Merge "Standardize stateToString return values" into mnc-dev