Merge "Fix vtable corruption." am: 9f45e826df
am: a3c0eceec2

* commit 'a3c0eceec20d67bfc9f3f031fea88d0442285879':
  Fix vtable corruption.

Change-Id: Ia6178e80f219fe78a26c5c0420878d462988f578