Merge "Revert "Do not make strong reference to Resources."" into oc-dev
am: 2f2e3f8ad5

Change-Id: I4b2f25475531003f8a4928e0b4a8eef05dfb9378