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

Change-Id: I85b82318d836df3721fd31e0f8bd029db3dc06bb