Merge "Snap for 13198286 from 838bd34deecb3715b2b4006edede2ab79e42e336 to sdk-release" into sdk-release