[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41"...

[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac05519 am: 196b64c2 am: af8b7b85 am: 25b8c8b3 am: c290ad33 am: b26a0100 am: 000e6625 am: 7bd058e3
am: 04a707b5

Change-Id: I0c8f651c09d06a0c5664bc64b17f048cc3ffa446