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

Change-Id: I62ab41ed83aa92b12e7fa3c9111a6f97e6ef13ef