Merge "Remove build log spam"