Merge "Fix out-of-bounds write past end of buckets on long transactions" am: 898879b988

Change-Id: I7ee931cd3f40ee385668ad8e6e160e0b6dcd0b84