Merge "Fix LogRecordTest#testSerializationResourceBundle"