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

Change-Id: I8c11f8cac81a8c9de0df8506f3bb3fa339422bb6