Merge "Make isSameTrustConfiguration public API" into pi-dev