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

Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9
tree: 5b3182b98fd23375c934838eb9721efee5b5fe0a
  1. core/
  2. services/
  3. tests/