lmp-mr1-supportlib-release @ 1950384 Change-Id: If208df96372cf78446d5409dbc1b98825d3245c2 (cherry picked from commit 2b2bbc0c)