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

Change-Id: Ida35556f6d57113ad06c736ef780580b814f673e