Merge "Couple more Scoped Directory Access changes." into pi-dev