Merge "Fix weak vtable warnings" am: d93a40c920 am: 11a2bcad06 am: cd77a5a218
am: 97514a25d6

Change-Id: Id5af70ceadd584f0dae7aa4d9bb4811ad822cf28