am 4bff8ab0: Merge change 20840 into donut

Merge commit '4bff8ab0e9073ae537e8a6c4ee8240a6698384f8'

* commit '4bff8ab0e9073ae537e8a6c4ee8240a6698384f8':
  Add "type" command to allow strings to be more easily typed.