am 0b366247: am edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev

* commit '0b366247acb2828caf105567efaaa219ad5563e4':
  Make runhat command work again.