[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev am: 99e9aa28af am: 0ebc8fe9d8 am: 2c1def3b03

Change-Id: I08123404a517bc32ae910bd31911aed43fae7ce1