Merge "Increase TEST_LINGER_DELAY_MS" am: 9a783699cc
am: 93c22129e2

Change-Id: I88d46b9fc0c3fddb02671a2c4875afbf151f8f84