Bike-rental: cherrypick 55198ac from upstream.