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