Merge "Snap for 5475808 from 001a126f8b054ec8541e04470c15a23d6a707260 to sdk-release" into sdk-release