Merge "Increase TEST_LINGER_DELAY_MS" am: 9a783699cc
am: 6918e10bff

Change-Id: I88d46b9fc0c3fddb02671a2c4875afbf151f8f84
tree: 29271a5b6e0543ba462be808f781dde36312c85e
  1. core/
  2. services/
  3. tests/