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

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