[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 30e2e54327 am: 2d6b83c629 -s ours am: 62fe600b01 -s ours am: 25b32b603f -s ours
am: 4f1e026d7a -s ours
am skip reason: change_id Ifefb749e0274ae018714340654287a0412b59b89 with SHA1 55d82d63b7 is in history

Change-Id: I345b4db4f8b6b06bacb889c8f74a2877dc03db30