am 56176a05: Fix ScannerTest failures.

Merge commit '56176a05205eaf469469c26988e99077aed0d7e7' into eclair-plus-aosp

* commit '56176a05205eaf469469c26988e99077aed0d7e7':
  Fix ScannerTest failures.