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

Change-Id: I22afb23e4ca6b9bf67a4a614c5fdc02852f29464