Adding METADATA to piex and merging with upstream

Test: Treehugger
Change-Id: I8938a11e67fc8a89cdadebd1df3928c50fb81788