Merge "Always mark reference referents in transaction mode."
am: 2fee212df6

Change-Id: I1579ad8f56b46e2c22a6e26718a3d8d91d6a55b3