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

Change-Id: I708fda61e866a891238d6dbbfc6a9b901e6da6b3