Merge "WeakHashMap: Remove some unnecessary lazy initialization."