[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev am: 4773895ad6 am: 346ec93169

Change-Id: If9320fdc1203205eb711dfb765a9d6059f33963e