Merge "Snap for 6660490 from 9fba6d0933c72d61b8025bc730a6ee1ac9902c3c to sdk-release" into sdk-release