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

Change-Id: I61304c58bd1569245c1f196a549a3ad8623f8915