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

Change-Id: I550412747a6afe16ff7791a8c50a4d7c6e9866e1