Merge "Re-enable the zipping of bluetooth logs" into oc-dev