Merge "Snap for 7110675 from dc8112e9cbc573ff6655fdd09523af113cd93c74 to sdk-release" into sdk-release