Merge "Add bionic as supported distro"