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

* commit 'dd1ee0b4de197b98e6e362470e763c2f8aac5492':
  Don't create if not primary user