am b63b031c: Merge "Standardize stateToString return values" into mnc-dev

* commit 'b63b031cb5b9338daa3de76ee9976ba493037d92':
  Standardize stateToString return values