[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (2/2) am: 7001ea1f7e -s ours
am: 64915c6f55

Change-Id: I3776e486fb53ba57e618a6bcb4a9f5786cf15d12