Merge "Do not make strong reference to Resources." into oc-dev
am: 327c0b9f88

Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a