Merge "Remove deprecated entitlement API" am: 36459170a7
am: 6f86953a39

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3