Merge "Ensure that ClassTable has correct alignment in image."
am: d16bb3f0dc

* commit 'd16bb3f0dc17d77db7022150d0710fcbb8b6fd9d':
  Ensure that ClassTable has correct alignment in image.