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

Change-Id: I242eb7e60f7f244d6c2bde610e7c35183de9adbe