Merge "Make cpi->speed always positive"