am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev

* commit '4667d247bbff30d7fe47a4022b91eb03da17be4d':
  Inconsistent media sizes for es-US locale.