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

Change-Id: Ic3a04af34c060c3d1e18c95a984cacaeba17f5b5