Merge "Make carrier config service binding file-encryption aware." into nyc-dev am: 5fb800b
am: e8cf08d

* commit 'e8cf08da113c99ddc0dd06ed903c586218024b88':
  Make carrier config service binding file-encryption aware.