Merge "Properly disconnect after skipping an operation." into pi-dev
am: cd7a174c59

Change-Id: Ida1308d4746001e818177bf6cdbfa0ec85a2afe2