Merge "Use strong CAS for identity hash code"
am: 2c12bb624e

Change-Id: I4769bbcd3f02dca4ba567159afcf563b37a7c99a