Merge "Don't create if not primary user" into lmp-mr1-dev