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