Merge "Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425 am: c6bddb82" into nyc-mr1-dev-plus-aosp