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

Change-Id: If2e53431ccd1bf4bc0bb720bf916b731a35fdaaf