Merge pull request #840 from TouchStar/support_proto_qmi