am 6a5af2ed: am 031ddea2: Merge "Fix identifier size in the heap dump."

* commit '6a5af2ed56f8d11f540ed56825513a8b283e1c8e':
  Fix identifier size in the heap dump.