[automerger skipped] Merge "Add disconnect messages related to WFC."
am: 625440a175 -s ours
am skip reason: change_id Ia3c0ec00cd2d03b360e4cf4aacfbd6d38c91e071 with SHA1 5d97b10918 is in history

Change-Id: I199a36d5711bc937400d6460ee82790692ac4557