Merge changes from topic "cherry-pick-cell-keepalive"
am: 8cabb012fa

Change-Id: I3001cd2693b2c57643672fd7f370b5cca2890585