Merge change I236092a3

* changes:
  Fixes crash in HierarchyViewer when windows hash code exceed int capacity. Bug: 2321018