Merge "httplive: fix overflow in BandwidthEstimator" am: 6cc43e10f4 am: 3c0f1962af am: 51ae9199be
am: 01abec8737

Change-Id: I43de1de085d2a3b8f02a7b6242dedfc6683a0a4f