Merge "Fix weak vtable warnings" am: d93a40c920
am: 11a2bcad06

Change-Id: I1fd134d6eedb2f324de36b8e066b7d942fccd2eb