Merge "Change the link layer stats long polling interval from 9s to 6s" into udc-dev