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

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