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

Change-Id: I4dcbf65c8b778815eef748ee348c928a258d40e0