Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev