Merge "Increase linger delay and test callback timeout"
am: 0544dfde7e

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