Merge "Snap for 8253222 from d07d694175ceb9eeba1d8faaedc91c7716889a5a to sdk-release" into sdk-release