am 1aea503e: Merge "Fix SimpleDateFormatTest when run outside California"

* commit '1aea503e8f568f9c17c14335783a89d41787e657':
  Fix SimpleDateFormatTest when run outside California