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

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