[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71 am: dae4e83eaf am: aef43d6eb2 am: 7bd5507383

Change-Id: I331838e6ec58b5df596779bf72f3b9d613d79be9