Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff
am: 51a89ee90c

Change-Id: I154876bd0294d0e31af63ed2e24c91d243eae56f