Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425c4
am: c6bddb8261

Change-Id: I49a856f9e635c21efe39a670c5f8a329a79858b3