Merge "Snap for 13235685 from 00157195db3e129a3ce13597077c2fdbce5cd82a to sdk-release" into sdk-release