Merge changes from topic "cherry-pick-cell-keepalive" am: 972b0961b5 am: 0da9c9d5b9
am: 6f06704c3e  -s ours

Change-Id: I1852cb11d6d33963b8e463729a952c4c22bc553a
tree: 0168b4ef8b31b90737a60bfdbe9f18cf3ca80d0e
  1. core/
  2. services/
  3. tests/