Merge commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b' * commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b': Extend Intent/Uri conversion for use by Browser
Merge commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b' * commit 'c14b9ccdf13163cae5ce5d21bcf377010b37594b': Extend Intent/Uri conversion for use by Browser