Merge "Offer to cache ContentResolver-related Bundles." into nyc-dev am: 815c6a8716
am: 961a091bc4

* commit '961a091bc485574842453028a8482daae30e9b45':
  Offer to cache ContentResolver-related Bundles.