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

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