ContentResolvers everywhere

Change-Id: I8fe0eb7bfea533dbad53adcefa52b0ff13e3dd4d