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

Change-Id: I368ffa5269029801ed191351fb1fff9bde72778a