Silently ignore duplicate heap entries am: cecd64012d
am: e26f826c24

* commit 'e26f826c24d6b143971ddd574c2b2695af1446be':
  Silently ignore duplicate heap entries

Change-Id: I71ba4d1e25ce3967455ea65a166fe2b77d476c55