Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805 am: 94b497bccc
am: f61df4329b

Change-Id: I4633607638c0c2a1ad05c76fc45eb6a894ff3202