[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec am: 0dcedd2073

Change-Id: I20247f18f27d668e38c6dbf6e79ce184d3641298