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

Change-Id: I417110875ccf4f1df9af5829c2702a5391f9b970