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

Change-Id: I85541bc03d008fabe857f03d9db8e2b56c1c8cfe