Merge "Increase linger delay and test callback timeout" am: ff9cfe36d3
am: 6f6fc2b758

Change-Id: I22afb23e4ca6b9bf67a4a614c5fdc02852f29464
tree: a9e2bb3456f059a9cc583933eed2a0417281490e
  1. core/
  2. services/
  3. tests/