[automerger] Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev am: 8ce83b6174 am: 5644b702e6 am: d1d43afc2e

Change-Id: I30e44311421c783970d37abe5f21b318941003ad