am 90dbd693: am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev

* commit '90dbd6936c72e2cc6a9ab4699c5af00edeb4cfd6':
  Use uniform font size for APNs and timezones. DO NOT MERGE.