DO NOT MERGE fix runstate race condition

Bug: 3107829
Change-Id: I94312ad10975af24660455c3aace97634f06f3e1
1 file changed