Merge "Update ubuntu1804-docker base image"