am 13aeac96: Merge "Fix broken card table asserts."

* commit '13aeac968f2473fcb4f31ccc6f43c6afc62db4bf':
  Fix broken card table asserts.