Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805 am: 94b497bccc
am: 27918e7ff1

Change-Id: I315e1b6638ea86d938643674031b9cef99764da5