[automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc92259 am: 058205df71

Change-Id: I4a611f6c94482d15730e356160c16e97f0881cc9