Merge "Snap for 11541002 from 5c6bfad5db7b7620acd75a2590b950ff9f45f4c5 to sdk-release" into sdk-release