Merge "Snap for 6435660 from a8085d20b44b9c0868860900862eea5629ce69a9 to sdk-release" into sdk-release