am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread

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