am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev

* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
  Fix docs per API review.