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

Change-Id: Ia26a9e3a3690f7c8a507f0d3f1d70cd9e1a1deec