Merge "Rename entitlement callback to adhere to API guidelines." am: 0102e3d548 am: 33a9d34e8a
am: 9eeac7326d

Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71