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

Change-Id: Iffd1ea689a9cedee4252836de208b506290c067b