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

Change-Id: I37370ea3ba788a9c115ab51a218c2208d9ecb265