Merge "Snap for 11573087 from cf26dde728f9a93b6247271e42a4cd890f6bec66 to sdk-release" into sdk-release