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

Change-Id: I9fe64d0896db76b06c2dbeca706795f280b058f3