am b632c302: Merge "Tidy up DecimalFormatTest"

* commit 'b632c3020038351efe98a0a87ac0394c89b8b2d1':
  Tidy up DecimalFormatTest