am 3501f858: Merge "Don\'t create if not primary user" into lmp-mr1-dev

* commit '3501f858cc014d19faa97cdf2ca837e7319e1c34':
  Don't create if not primary user