9946639f74
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4' * commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4': Implement new MockContentProvider. Also make ContentProvider aware of the class.