Following the completion of the San Francisco-Oakland Bay Bridge in late 1936, SR 17 was re-routed. Instead of turning west at Davis Street in San Leandro, it was continued along East 14th Street into Oakland. At 44th Avenue it turned west, leading to a new diagonal connection to East 12th Street. SR 17 then followed East 12th northward to 14th Avenue, then one block on 14th to East 8th Street, becoming 8th Street into downtown Oakland. It continued west on 8th, picking up a concurrency with Business Route US 50 at Broadway. Both routes continued on 8th to Cypress Street which became an elevated viaduct entering the Bay Bridge Distribution Structure ("The Maze"). SR 17 terminated here at its junction with US 40 (Eastshore Highway) and US 50 (38th Street).