Merge "Increase network request timeouts" am: 527c79d96d am: 8b894a7d50
am: 2eb9f746cf

Change-Id: I972f717a2ba2ef17e372f7d2afe3a29d4ed839d2