Merge "Rename CallbackRecord to CallbackEntry" am: 36ad0924b9
am: cbc0d9dbfc

Change-Id: I07ef4756a74c0c670fc5fbb4bdd8ac61344adc0a