Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev
am: 5293df6bb6

Change-Id: I54288e3fe8017dc920fead91513ea7ab6d22b849