Merge "Fix the race between entitlement start/stop" into qt-r1-dev am: 5d6e98773f
am: 03bd7b0ee3

Change-Id: Ia77281eec702aecc6cd450ba8820272a1f3701a2