Merge "Fix vtable corruption issue" into nyc-mr1-dev
am: 949ce9c1da

Change-Id: Ic5fc1c6cd47d3620676a5fb4357f09f4727087b9