Merge "CookieTagMapValue.java - uid U32 -> S32"