am d343e355: Merge "Remove an obsolete Pacific/Apia hack."

* commit 'd343e35535a99bad32eea0defc8a3e9c23c9967f':
  Remove an obsolete Pacific/Apia hack.