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

Change-Id: Ic033f212e02a33e9414e284a1f6068ef7c4b0134