am 322cabe3: Merge "Fix testCalendarSerialization for all locales"

* commit '322cabe3492bb1dd9d590047f9f1f3f55212ffdd':
  Fix testCalendarSerialization for all locales