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

Change-Id: Ia01dbc28d95d1f6749bc1de79f632e3553eb51e3