Merge "Revert "Update A11y action serialization to use longs""