Merge "Fix benign overflow in getTimeUsOfGranule"