Merge "Snap for 5475808 from bd01d2e2d8aa7a5a405c5c8d1660034da3b74279 to sdk-release" into sdk-release