Merge changes from topic "cherry-pick-cell-keepalive" am: 7e8374e9fc am: 86362b4677
am: 16f3959dd0 -s ours
Change-Id: I1852cb11d6d33963b8e463729a952c4c22bc553a
This commit is contained in: