[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 36ba892cf9 am: a37455ef23 am: 2ef64864b7 am: 0603c80387 skipped: 42b2fd9bd5 am: 88476a1f2e am: 8119536c70 am: 08f3a876f6 -s ours
am: 2ba23e71bd

Change-Id: Ib246cd1133e4ab53e01f70e45b82a46e0514ed7f