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

* commit '95e4474c7069bdd85178aab96182bc0088b43a70':
  Fix docs per API review.