Merge "Make carrier config service binding file-encryption aware." into nyc-dev