Merge "Limit btsnoop file size (3/9)" into oc-dev