Merge "Snap for 5590969 from b0592fd1f976c533fc15ba6083af0262d328a495 to sdk-release" into sdk-release