Merge "Improve dumb terminal detection"
am: a3ded95424

Change-Id: I8e602bcfd343f6d7ec2163460c89956d0eccdbbc