am cd8ce955: am 01a1441d: Merge "Fix mapping for Field.TIME_ZONE."

* commit 'cd8ce9550bc059576e8012556f820578ed7e8cc2':
  Fix mapping for Field.TIME_ZONE.