Merge "Reword outdated fonts comment" am: ea2bea3bed am: f0871b9488
am: 9aeb110410

Change-Id: I20dd9d98e4169ce65c01ca5d639100787d4c9f1c