Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev