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