Merge "Snap for 7110675 from 88c8330514690d054c2dce70353f8f76615d8dab to sdk-release" into sdk-release