Merge "Fix inconsistent logging in registerReference." am: cda4a169a7 am: cd5fdcf35c
am: 63c1678000

Change-Id: Ia6679d9c6d7a60e6170ed725fbf6c1d75fb42556