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

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