Also fix the tests to handle the new threadedness while here. Bug: 20067687 Change-Id: I116bf14c71886b251c2e8bcaeb2c9b0e5f9ec817
Also fix the tests to handle the new threadedness while here. Bug: 20067687 Change-Id: I116bf14c71886b251c2e8bcaeb2c9b0e5f9ec817