Merge \"Protect against crash in font size\" into nyc-dev
am: 4b336099f1

Change-Id: Ida2f0e275cea74516616374b858816f162f76dd3