Merge "Snap for 13235685 from 7e08958a6cbe2b02c9d80a66fba68fd8a864d73d to sdk-release" into sdk-release