am 51812754: am 25082e33: Merge "Another optimization of glyph cache uploads"

* commit '518127549997fbf01fd3af59c4312e43f137e194':
  Another optimization of glyph cache uploads