am f7ec627f: am 1127e1b6: Merge "Fix benign overflow in getTimeUsOfGranule"

* commit 'f7ec627f451abbd17ee0c2cb57e07700cf671f2f':
  Fix benign overflow in getTimeUsOfGranule