Merge "Fix race condition between restart and stop/reset."
am: ee14225e0d

Change-Id: Ia49e967f5fb7fc58058c260fcad4559b2a4df15d