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

Change-Id: If0a80dbb5ff1929acf21ce4256876b5e6d511e6c