[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a

Change-Id: I01648d7eb843c440c7b72ec26e35a9aee60eeff0