Merge "Store class tables in the image" am: a616b4e086 am: e8d71c13ad
am: c0206e1a89

* commit 'c0206e1a89fc996425f2b4b440d98a7425be6e1e':
  Store class tables in the image