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

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