Merge "Merge "Re-enable the zipping of bluetooth logs" into oc-dev am: cf2efe056b am: a566e4b48e"