Merge "Handle exceptions when accessing Content providers." into mnc-dev