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

Change-Id: I1de0c20b091a2c2e711ba9e880da971779f3661d