Merge "Snap for 8554636 from 298744478e019cd13cd6930ddaf2a8df1c8fd027 to sdk-release" into sdk-release