Merge "Delay pruning direct share targets." into pi-dev
am: 22385d9d4e

Change-Id: Ic94163018248073c54416a2196591af98e22e944