Merge "Snap for 13278158 from c6cfbd7d572a491c8a91b60db86d8892295233d3 to sdk-release" into sdk-release