Merge "Move keepalive constants to their right place"
am: 236b96f327

Change-Id: Ib8ce4aaf8258c0dc67b3acc0e463b9e282cee464