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

Change-Id: I0f967af6788f4ec7d06da8866d37d9cd121caff5