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

Change-Id: I3f4858c0f083b7f0649309524c8f80bf275c28ee