Merge "Explicitly specify user for public mode" into lmp-mr1-dev