Merge "[automerger skipped] Merge "Fix the race between entitlement...

Merge "[automerger skipped] Merge "Fix the race between entitlement start/stop" into qt-r1-dev am: 5d6e9877 am: 03bd7b0e -s ours
am: f9b22918 -s ours
am skip reason: change_id I63f858356b4543b5bdda41d03e45adc944b86da3 with SHA1 ccfd0e35 is in history

Change-Id: I8b6334085f29e7abbedd4748d1834c499bf1f985