Merge "Ignore the asynchronous result while stopping keepalive" am: ea6508f9b7 am: 8680cda689
am: 22f2976c84

Change-Id: I5f1709f35a5faec7d9a110f3fa24e89ed1b05fbe
tree: 10cdf48c551afb9ecfe648f70710da5416d895d4
  1. core/
  2. services/
  3. tests/