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