Merge "Rename CallbackRecord to CallbackEntry"
am: 63fea675c7

Change-Id: Ibfe98cf26ee65711b5366edfc5d95e64dcfec266