Merge "Snap for 5590969 from 43548a7042200a4f0521a02488cd287ac2fc00fd to sdk-release" into sdk-release