Merge "Refactor the EntitlementManager" am: 741e2db5 am: 6dc0be2b am: 3ee8de4e am: 85c393c8 am: af476d23 Change-Id: I1de0c20b091a2c2e711ba9e880da971779f3661d