Merge "Revert "Unit test for socket cookie upstream patch"" am: 7455bf0d am: 57544ea6 am: 0b7174ca am: 5fac57c7 Change-Id: I7624b0e1d74077f611052c5ce63b9694451b0e64