am b67d4ec5: am 950a3c01: am 51519521: Merge "Add tty defaults to bionic"

* commit 'b67d4ec5babf7d26bc0e52b942779012d14e14c8':
  Add tty defaults to bionic