Merge "ahat: fix bug parsing ids with the high bit set."
am: 884aa15bb3

Change-Id: I24e0422e4e2ab874f0a77ffbcd68798ca5334349