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

Change-Id: I7e3e2909dbd5f42b2d6b23ecc019e697665d3dc5