Note that WeakMap no longer extends Map, because it does not conform
to the generic Map interface.

Change-Id: I72ea681528c932d84c95f095434e1dc95b0a3d16