[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state...

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b am: 286cfd69 -s ours am: b6e53063 -s ours am: c77fe253 -s ours
am: fa6be4f1 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history

Change-Id: Iebb4af47eb8651bdb6c3192743c710e02668b070