Merge "Rename entitlement callback to adhere to API guidelines."
am: 0102e3d548

Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a