[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9d am: 523fed0d Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675