am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev

* commit '152440c67acace16dc1655a821352b0d69a61562':
  new device family image for design, not photos