Merge "Snap for 4794708 from 8ab2b2a747942e08cf8c3591bf2f8f783602316e to sdk-release" into sdk-release