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