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

* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
  Fixing improper boxing to Integer instead of Long.