am b7c97ec6: Merge "Provide more information about the runtime"

* commit 'b7c97ec6be8fa92c5593b1ab49b4a952a741c9fd':
  Provide more information about the runtime