Merge "Update scanner test."