Merge "Snap for 13198286 from efb367e9cfe1740528a9e5fa670232dd051fb348 to sdk-release" into sdk-release