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

Change-Id: Idf607b6f405a5801fb3b9c87380708318b823cb9