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

Change-Id: I22bed228480d22ac630abe6b52d6e5d42685f51d