Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev