Merge "Snap for 13278158 from de876a01b29230b877c9f408348c38a90ee724a5 to sdk-release" into sdk-release