Merge "Release keepalive slot after stopped"
am: 79c7b5a300

Change-Id: Ic707f22fb12c98c187e89cc8ad39773f61737506
tree: 991f9c201a46f77c2f8a1003f5be06f126d02a2b
  1. core/
  2. services/
  3. tests/