Merge "Ignore the asynchronous result while stopping keepalive"
am: d1723694a4

Change-Id: Idc6d76ca412f7bbae3b32e81756c419d84dc2c80