am 94d064c1: am b632c302: Merge "Tidy up DecimalFormatTest"

* commit '94d064c13bc3568c17d28c07a264af3e335f07d1':