[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 9a79545b am: 6ac83394 -s ours am: e52f0a0a -s ours am: 82936d19 -s ours am: b2a3719f -s ours
am: 0c2cc5a1 -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 d02a284e is in history

Change-Id: Ib3aa0b978d16a10281728b67663bed8ffe35a2a8