Merge "Snap for 8167433 from a08ebb3086153e764e91b924a72bdfd83f70ba64 to sdk-release" into sdk-release