Merge "Snap for 6435660 from 7a523ca147c6f17b0d946ffc3a1f6f8a55bfd313 to sdk-release" into sdk-release