am a2c6e06d: Merge "Fixing a couple of crashes when mContentUri is null."

* commit 'a2c6e06dfa4e83925a9af7d3b455b48e5e97f067':
  Fixing a couple of crashes when mContentUri is null.