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

Change-Id: I5142e0a5c495933b87399cc0b62f1b881b04330e