Merge "Limit LOG_TAG in header"