Merge "Refactor the EntitlementManager" am: 741e2db5d2 am: 6dc0be2b69 am: 3ee8de4ecd

Change-Id: I5b3093d1aa1085293bdc092cc0bdc643669d04cc