Merge pillar into meta

Change-Id: I994320914be6264c6a6be24b76a39e61cf2fe206
Related-PROD: PROD-25235 (PROD:25235)
1 file changed