am adbb3352: am a2d1469c: Merge "Use new defines in test code."

* commit 'adbb3352e9ce98e2012fa136198daa8342bdac00':
  Use new defines in test code.