Merge "Snap for 6348162 from c39448de67f76105bf4ba6d0f6ffda7a3b00ece6 to sdk-release" into sdk-release