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

Change-Id: I1852cb11d6d33963b8e463729a952c4c22bc553a