am 16e5d71b: Merge "Revert "new device family image for design, not photos"" into klp-modular-dev

* commit '16e5d71b6bf78d00680d7e9efaf4e94273941292':
  Revert "new device family image for design, not photos"