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

Change-Id: I1f0840a3fec3605e51942e8bc0debb954fd571d5