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

Change-Id: I530b34008bb703e2bf97f1d746dbb45d35616c3a