Fix percentile calculations am: 52d1540b2e am: d65c52d48d am: 73540c1ce0  -s ours
am: be57005be0  -s ours

Change-Id: Ife386935ec5a2b8c7f729c837b773e5d44b45448