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

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