Adjust Package Content

Change-Id: I17b2141ada2e6c1c3cf36cd23a2aa200f487398e