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

Change-Id: I0642f3cafbaf3bf0ca31222183b3f511eba3740d