Merge "Annotate root objects and show their types." am: 0e72abfae7
am: ec698a4bb9

* commit 'ec698a4bb94298aa5b6d0d66f31a42d1a5674abb':
  Annotate root objects and show their types.