[automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into mnc-dr1.5-dev am: b473d825 am: 96c1d6df am: 7a3d5521 Change-Id: I31f8d3acdf2befb610bd01fe353f6ffa5c996608