am 628e5214: am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev

* commit '628e52147bf2df00f180b4c9157398edaffb2b19':
  Missing Javadoc update while API review