am 2faf91fb: am 66cbec51: am d234dc1f: Merge "Correct check of is user running"

* commit '2faf91fbb300882afd1092b788aa16295eb3dde8':
  Correct check of is user running