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

Change-Id: Ib4ba3f739a91ea2700611732f71afec0cc997ae4