Merge "Snap for 9550355 from 8050a03fe40e738b11d84aa3ec7b245c282c683f to sdk-release" into sdk-release