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

* commit '7efb0521ff4af2eeca5c99011ece066848069ffc':
  Check user state after clearing identity.