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