Merge "Upgrade log4j to clear security issue"