Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e
am: 6a9f651b73

Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67