am 1c3553b5: am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev

* commit '1c3553b57f455665deb32c328298ab70152410e8':
  Fix build breakage because missing API methods.