Fix vtable corruption.
am: b554343e1d

* commit 'b554343e1d72104f0b26e749c1877d0566667a85':
  Fix vtable corruption.

Change-Id: I3b5086010a5ef2e348443d50de5167172e4f3812