am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit '6ff64bc34daf55874f5372d0cda444f67c892bdf':
  TIF: Get or create the user state when failed to find existing one