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

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