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

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