Merge "Fix for too many binder calls in packagemanager"