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

Change-Id: Iaf388732140d5e3d134c9a60db459410ad6a944c