Merge "[DO NOT MERGE] Explicitly keep relevant LogBuffer classes for plugins" into udc-dev