Merge "Snap for 13278158 from 4f463a6b1de9198963dc6aff74154a504ba3f8f6 to sdk-release" into sdk-release