am 5ffb19ae: am f30b6474: am c2d6e51d: Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev

* commit '5ffb19aed5826bd78ca5861ffffaa814d8e4169a':
  The undefined media sizes for both orientations not properly constructed.