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

Change-Id: If53d8d66c21d27a5e77a48a5234092aaa0bf8ad0