Merge "Fix EntitlementManager issues" am: 14a8cf0f am: 633130f6 am: a6f442db am: b1364534 am: 03adb6db Change-Id: Ia353f570bc9706b1d1ae1eeb3684cf64a686ff15