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

Change-Id: I8da68aa1f7ebe6b4e83f12714db521a38a849dad