Merge changes I2abd6716,I4a65f7f8

* changes:
  cpu_speed_test: cosmetics
  aq_segment_test: cosmetics