Merge "Fix the race between entitlement start/stop" am: 0a4baeae84 am: 4724e40ffa am: e65d952a5c am: 579abd4248
am: 5de1c3eecd

Change-Id: If99cfb67cb81b2eccf678e6a1c2b2cbe0741ef1c