Merge branch 'client_activity_timeout_fixes' into r1.5