Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8-lmp-mr1-dev" into lmp-mr1-app-dev
am: ca00bfc2d3

Change-Id: Iad7618c5b38f57309554ff2c9edd3538b128024c