Merge "Re-arrange System.identityHashCode for better performance."
am: 993f7c6e25

Change-Id: Ibbb3bb6afb41d1323061c231f644a0f3a22e04b7