References #2315: Updated javadoc based on feedback from Kei.

Change-Id: Iac3599cead82915ed42da7fef0a6bb250299d25b