Merge "[CM] Allow timeout in request network" am: 8328f27a87
am: 645b48c8af

Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82