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

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