[kubernetes/f21] Bump to upstream 1c61486ec343246a81f62b4297671217c9576df7