am 7d6c3f70: Merge "Remove the \'Factory\' time zone by not processing the \'factory\' file."

* commit '7d6c3f700b8089d31a33ba0f9f6eed9407724d0d':
  Remove the 'Factory' time zone by not processing the 'factory' file.