Merge "Snap for 9979206 from cb1f744e261198dea2ca78ac7a2bbe0d26d51c09 to sdk-release" into sdk-release