[automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev am: ef5bc922 am: 058205df am: 4d3f46cd am: af29d06b Change-Id: I96ac7931392806313216d5ee27629ffe4e934f94