Merge "Increase network request timeouts" am: 9ee086a4d5
am: 2ca2502e64

Change-Id: I1f0840a3fec3605e51942e8bc0debb954fd571d5
tree: 99d0114f256832b5d24d141248a97409ebbd2d6c
  1. core/
  2. services/
  3. tests/