Merge "Filter package manager calls" into oc-dev
am: 07c832f405

Change-Id: Ie2a7bf1da693f67d9d4a6cc2ee1e9b8ea000de29