Merge "Refactor the EntitlementManager" am: 741e2db5d2

Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14