Android CTS 5.1 Release 23 (4259358)
Merge "Make ping use socket marks properly."