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

Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68