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

Change-Id: I2ebff1197e09cebdb0283217f48b5144d5807872