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

Change-Id: I20f043dcff67b6c375358950d8b1a0a01f047193