Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb