Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b
am: f0a36952dc

Change-Id: I674e2feb8e4d5378765c6ebec371d76cef7d769a