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

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