Merge "Edits to remove "fail" references, plus edits to "stopped by mistake" dialog. Bugs: 5174094 and 5165745"