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

Change-Id: Idd0c2d7be02d4de7318e805d639ad0d5cc016e44