Merge "Update loganalysis classpath"