Merge "Add implemention for isSameTrustConfiguration" into nyc-dev