Merge "Snap for 13198286 from 2663cf0a414bd603d6a833cb691cea76eb1897b7 to sdk-release" into sdk-release