am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for...
am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '04f36983':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946