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

Change-Id: If7e8d4d2cdc734bab90b4abf0f2cba16645e4a6d