Merge "Snap for 11754915 from a59278fdd9a450cfde3e779213a8e98e503ef86f to sdk-release" into sdk-release