Merge "Fix one race condition between start and stop."
am: 876b13d0ec

Change-Id: Id2aee53665a57772f29c9f2e7604ba5418bfaecb