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

* commit '58476e2d5262bf234363d3d9a3ffd1e48e93b487':