Merge grains with pillars for static targets

Change-Id: I2f85fe2f9cc67d2d03d5e8dad5ac0b74e82b0fcc
2 files changed