Merge "Filter package related info" into oc-dev am: 72b7b1f001
am: 36482247ea

Change-Id: I8b5a7d1c08e7d6f822347aaed2b15e4e270d0a49