am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo

Merge commit '6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken

* commit '6e40664fc75e25ebeafda883fc2bba27279bebdd':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.