Merge "Quit SapServerHandler safely avoid failure"
am: fac9a9871f

Change-Id: I5b6427647f7b2044fb543879866c6c9ca475243f