Fine-tune the generation of factory images

Change-Id: I574bdab542a30931016db532e529386b4e4ef0d1
2 files changed