Merge "Snap for 11692525 from 68d35252e6fee0a066376452cb3c2cac36c3c3be to sdk-release" into sdk-release