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

* commit '25082e3326a3133607129b3e4cea983b113e9764':
  Another optimization of glyph cache uploads