am ea6bb1b4: (-s ours) am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread

* commit 'ea6bb1b4d7111dfd084f772f83094bda662fdb23':
  DO NOT MERGE fix runstate race condition