Merge "Snap for 6686656 from ed87fbd3e94173069244715dfaf8c27b7a42c5e6 to sdk-release" into sdk-release