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

Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9