Merge "Snap for 13131917 from cbf0c552368bfe1b6c551f93ae29a4e273582ba3 to sdk-release" into sdk-release