Make sure to apply latest configuration to resources
am: 3b3c914e62

Change-Id: I5dc1d3518b1568bd8c52c947e7425563553bcf9d