[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5 am: 460898007c

Change-Id: I7a7bc02eb28d856dea9eeea9f398b1458352fb84