Merge "Fix vtable corruption."
am: 9f45e826df

* commit '9f45e826df313af13f5204210eebf12b2867c6b7':
  Fix vtable corruption.

Change-Id: I3e9865f94550fd8da375bb8c8535bbfeebad78e5