am 02c6b367: Merge "Remove deprecated API usage" into lmp-mr1-dev

* commit '02c6b3677c006ced9aa28bd2035fa6d797864983':
  Remove deprecated API usage