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

Change-Id: I4d6057528cf25ed78285812b11b8bb633ae84542