Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" am: 1a4d234daa am: 70f3689a70
am: 5deab15122

Change-Id: I6e1521a74e85a67a99e101093d2dc7eaeb16a3b0