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

Change-Id: I982b94c155849061a667b1bf90f7a511bb81b1c5