Merge "Snap for 5590969 from c58c13980109262b47f3149a2d3f302d0a589055 to sdk-release" into sdk-release