Merge changes from topic "cherry-pick-cell-keepalive"
am: 972b0961b5

Change-Id: I3001cd2693b2c57643672fd7f370b5cca2890585
tree: 4416dfcf3ada0ba7591cac8084e063e658936f75
  1. core/
  2. services/
  3. tests/