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

Change-Id: Ie8f090c0049715bfc2d23a4f2d1f8d90c227b0e2