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

Change-Id: I14f0b27d9d068df1defed18cd148ee331e0e876a