Merge "Snap for 5590969 from 2cf846312eb93fb962655ac29ef956606bfd6356 to sdk-release" into sdk-release