am 1578357d: Merge "Check user state after clearing identity." into mnc-dev

* commit '1578357df737296aa151c6934fe7dd749a43ae15':
  Check user state after clearing identity.