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

* commit '429e222506b1a0c6db5601decc7276ef7884ee09':