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

Change-Id: Ib409b85729972e23242551beb39638aaefad0584