Merge "Ignore the asynchronous result while stopping keepalive" am: 7934214f4c
am: deae9510db

Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9