Adding timeout support for httpPing am: f2a1090bde am: aed1022633 am: b37d27d334
am: 417c2cae5b

Change-Id: I363dacad8147eb64d303172657c2d7be87faaefa