Merge \"Make sure to apply latest configuration to resources\" into nyc-mr1-dev
am: 8fcd8f1fb9

Change-Id: I994329624e4312c1e6eb018793d08fe0a041c4b1