Merge "Test per-UID time_in_state files" am: eb08ea5747
am: 521a24f162

Change-Id: I070ba0bea44aa9d32deaf1d22e61cbae48de3bdf