Merge "Fix the race between entitlement start/stop" am: 0a4baeae am: 4724e40f am: e65d952a am: 579abd42 am: 5de1c3ee Change-Id: If99cfb67cb81b2eccf678e6a1c2b2cbe0741ef1c