Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev