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