Merge "Fix the race between entitlement start/stop" am: 0a4baeae84
am: 4724e40ffa

Change-Id: I2d88debbcb47abb7997505c3741bc48fc815ada8