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