am 8c808187: Modify test code a little.

Merge commit '8c808187249f473702e0f4bee2147da292490963' into eclair-mr2-plus-aosp

* commit '8c808187249f473702e0f4bee2147da292490963':
  Modify test code a little.