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