Merge "Bugreport includes /metadata/ota"