[automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac05519 am: 196b64c2 Change-Id: I88db62bf864dfd51d8efe1e445fe953c17d684d9