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

Change-Id: I940b302d468b6c636efd775ff0729d41b317477b