Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev
am: 220213623b

Change-Id: I64dc27a3b6982c33ed8bb6f3c6b2801480447faa