Merge "Cleanup in the face of upstream error" am: ed6d75d5f3
am: 76e6f790db

Change-Id: I097318f3edc5257288d582a0f17744e1f984856c