Merge "Rename CallbackRecord to CallbackEntry"
am: 36ad0924b9

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266