Merge "Snap for 13198286 from 4e466e8f90e5c15c029a18461cc384c0f7777193 to sdk-release" into sdk-release