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

Change-Id: Ic9164f55540e27e5160b20a2cdcc0ede692334fd