Merge "Add tty defaults to bionic"