am e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 595bcb4  -s ours automerge: 2369935  -s ours
automerge: 0570fd9  -s ours

* commit '0570fd9c9cf0929140e8d16ebe78a5189f8b01bb':