Merge \"Merge \\\"Protect against crash in font size\\\" into nyc-dev am:...
Merge \"Merge \\\"Protect against crash in font size\\\" into nyc-dev am: 4b336099 am: b48664b9\" into nyc-mr1-dev-plus-aosp
am: f422b7bb
Change-Id: I441f89f3856685854800421da37312bf6b6d4a79