Merge "Replace collect with clear for the SoftReference policy." into honeycomb