Merge "Snap for 5475808 from e3866e8e7b14c571c3702b744c80a3f722004068 to sdk-release" into sdk-release