Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev am: add479f
am: 23b3efa

* commit '23b3efa1f4339cc96d986b130cbe9a7dd0486ccb':
  Moved ERI configuration files from resoures to Carrier Config.

Change-Id: I534a10006b130b8c1e5d25f35bf35cba46488b33