Merge "Increase linger delay and test callback timeout" am: 716c04b29a am: b70a230584
am: 9e95f67b19

Change-Id: I2a3b3a183cd3f852df98cf55693b9486cc5f4043