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

* commit 'bed66d8e567935f9de6fc748c22d4b8eadd8b00d':
  Fix SimpleDateFormatTest when run outside California