[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc am: dae4e83e am: aef43d6e Change-Id: I89aaa744a375f13466bf7bbf41ef1b7bb5dd3395