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

Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369