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

* commit 'dcafbc3b0cc6f2a7a2d70a6f887025a8ed447afd':
  Remove deprecated API usage