Merge "Remove deprecated entitlement API" am: 9d9850ae30
am: c818ace0cc

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3