am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."

* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
  Fixing improper boxing to Integer instead of Long.