Merge "Snap for 5934975 from d1cb35bdefce0b04c7a8167e0a9fad675a0df902 to sdk-release" into sdk-release