[automerger] Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev am: a5c3676d9f am: 1cd6d429d1 am: 54fb9da18c

Change-Id: I32ba1bd275bd9356a2bb162d85813fdcfbdd2e96