manually cherry pick this patch https://git.opendaylight.org/gerrit/#/c/34579/