Merge "Silently ignore duplicate heap entries am: cecd64012d am: e26f826c24" into nyc-mr1-dev-plus-aosp