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

Change-Id: Ia902911c856ee0c6c5b6fa51527071f3b469775f