Merge "Fix serialization in DecimalFormat / DecimalFormatSymbols." am: 446ce13bf1
am: d09e8bcaa3

* commit 'd09e8bcaa3a7f2f6bc4b4217d8bb547ce1790335':
  Fix serialization in DecimalFormat / DecimalFormatSymbols.