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