Merge "Fix javadoc for some user restrictions." into oc-dev am: 9c8bb68071
am: 9488302c42

Change-Id: Id6bd824580abfec1b5c7d6ae7c555eecfed39989