Merge "Increase network request timeouts"
am: 527c79d96d

Change-Id: Iaae31d7eaa5e5ccccdcf63ba39dd3fdc729161a5